portal: Own org.gnome.Shell.Portal for the access portal

org.freedesktop.impl.portal.desktop.gnome will be used for the
GNOME implementation of desktop portals in the future, so make
sure GNOME Shell's implementation of the access portal won't
conflict.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1872>

diff --git a/data/gnome-shell.portal b/data/gnome-shell.portal
index b70463777bf6ff4ae845c8e2fec4698bcf0fbdea..a7cd0d53276ba60c7d58af90faf8dbc7239ffc44 100644 (file)
--- a/data/gnome-shell.portal
+++ b/data/gnome-shell.portal
@@ -1,4 +1,4 @@
 [portal]
-DBusName=org.freedesktop.impl.portal.desktop.gnome
+DBusName=org.gnome.Shell.Portal
 Interfaces=org.freedesktop.impl.portal.Access
 UseIn=gnome

diff --git a/js/ui/accessDialog.js b/js/ui/accessDialog.js
index 0e417bda7bf38ea2523a50487a76100b727f9d02..057cd5b1bb7bc161e222428d1c03527649508e73 100644 (file)
--- a/js/ui/accessDialog.js
+++ b/js/ui/accessDialog.js
@@ -124,7 +124,7 @@ var AccessDialogDBus = class {
         this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(AccessIface, this);
         this._dbusImpl.export(Gio.DBus.session, '/org/freedesktop/portal/desktop');
 
-        Gio.DBus.session.own_name('org.freedesktop.impl.portal.desktop.gnome', Gio.BusNameOwnerFlags.REPLACE, null, null);
+        Gio.DBus.session.own_name('org.gnome.Shell.Portal', Gio.BusNameOwnerFlags.REPLACE, null, null);
     }
 
     AccessDialogAsync(params, invocation) {